feat: add `AccountTreeController` #5847

ccharly · 2025-05-22T15:06:59Z

Explanation

New controller to group accounts based on some pre-defined rules.

References

https://github.com/MetaMask/decisions/pull/71

Changelog

N/A

Checklist

I've updated the test suite for new or updated code as appropriate
I've updated documentation (JSDoc, Markdown, etc.) for new or updated code as appropriate
I've communicated my changes to consumers by updating changelogs for packages I've changed, highlighting breaking changes as necessary
I've prepared draft pull requests for clients and consumer packages to resolve any breaking changes

…AccountGroupController

… function

ccharly · 2025-05-23T14:58:00Z

@metamaskbot publish-preview

github-actions · 2025-05-23T15:03:26Z

Preview builds have been published. See these instructions for more information about preview builds.

Expand for full list of packages and versions.

{
  "@metamask-previews/account-group-controller": "0.0.0-preview-e96d94ef",
  "@metamask-previews/accounts-controller": "29.0.0-preview-e96d94ef",
  "@metamask-previews/address-book-controller": "6.0.3-preview-e96d94ef",
  "@metamask-previews/announcement-controller": "7.0.3-preview-e96d94ef",
  "@metamask-previews/app-metadata-controller": "1.0.0-preview-e96d94ef",
  "@metamask-previews/approval-controller": "7.1.3-preview-e96d94ef",
  "@metamask-previews/assets-controllers": "63.0.0-preview-e96d94ef",
  "@metamask-previews/base-controller": "8.0.1-preview-e96d94ef",
  "@metamask-previews/bridge-controller": "26.0.0-preview-e96d94ef",
  "@metamask-previews/bridge-status-controller": "23.0.0-preview-e96d94ef",
  "@metamask-previews/build-utils": "3.0.3-preview-e96d94ef",
  "@metamask-previews/chain-agnostic-permission": "0.7.0-preview-e96d94ef",
  "@metamask-previews/composable-controller": "11.0.0-preview-e96d94ef",
  "@metamask-previews/controller-utils": "11.9.0-preview-e96d94ef",
  "@metamask-previews/delegation-controller": "0.3.0-preview-e96d94ef",
  "@metamask-previews/earn-controller": "0.14.0-preview-e96d94ef",
  "@metamask-previews/eip1193-permission-middleware": "0.1.0-preview-e96d94ef",
  "@metamask-previews/ens-controller": "16.0.0-preview-e96d94ef",
  "@metamask-previews/eth-json-rpc-provider": "4.1.8-preview-e96d94ef",
  "@metamask-previews/gas-fee-controller": "23.0.0-preview-e96d94ef",
  "@metamask-previews/json-rpc-engine": "10.0.3-preview-e96d94ef",
  "@metamask-previews/json-rpc-middleware-stream": "8.0.7-preview-e96d94ef",
  "@metamask-previews/keyring-controller": "22.0.0-preview-e96d94ef",
  "@metamask-previews/logging-controller": "6.0.4-preview-e96d94ef",
  "@metamask-previews/message-manager": "12.0.1-preview-e96d94ef",
  "@metamask-previews/multichain": "4.1.0-preview-e96d94ef",
  "@metamask-previews/multichain-api-middleware": "0.3.0-preview-e96d94ef",
  "@metamask-previews/multichain-network-controller": "0.7.0-preview-e96d94ef",
  "@metamask-previews/multichain-transactions-controller": "1.0.0-preview-e96d94ef",
  "@metamask-previews/name-controller": "8.0.3-preview-e96d94ef",
  "@metamask-previews/network-controller": "23.5.0-preview-e96d94ef",
  "@metamask-previews/notification-services-controller": "8.0.0-preview-e96d94ef",
  "@metamask-previews/permission-controller": "11.0.6-preview-e96d94ef",
  "@metamask-previews/permission-log-controller": "3.0.3-preview-e96d94ef",
  "@metamask-previews/phishing-controller": "12.5.0-preview-e96d94ef",
  "@metamask-previews/polling-controller": "13.0.0-preview-e96d94ef",
  "@metamask-previews/preferences-controller": "18.0.0-preview-e96d94ef",
  "@metamask-previews/profile-sync-controller": "15.0.0-preview-e96d94ef",
  "@metamask-previews/queued-request-controller": "10.0.0-preview-e96d94ef",
  "@metamask-previews/rate-limit-controller": "6.0.3-preview-e96d94ef",
  "@metamask-previews/remote-feature-flag-controller": "1.6.0-preview-e96d94ef",
  "@metamask-previews/sample-controllers": "0.1.0-preview-e96d94ef",
  "@metamask-previews/selected-network-controller": "22.1.0-preview-e96d94ef",
  "@metamask-previews/signature-controller": "29.0.0-preview-e96d94ef",
  "@metamask-previews/token-search-discovery-controller": "3.1.0-preview-e96d94ef",
  "@metamask-previews/transaction-controller": "56.2.0-preview-e96d94ef",
  "@metamask-previews/user-operation-controller": "35.0.0-preview-e96d94ef"
}

packages/account-group-controller/src/AccountGroupController.test.ts

packages/account-group-controller/src/AccountGroupController.ts

ccharly · 2025-05-26T13:22:09Z

packages/account-group-controller/src/AccountGroupController.ts

+  accountGroups: {
+    groups: {
+      // Wallet
+      [accountGroup: AccountGroupId]: {
+        // Multichain Account OR Account Group
+        [accountSubGroup: AccountGroupId]: AccountId[]; // Blockchain Accounts
+      };
+    };
+  };
+  accountGroupsMetadata: {
+    [accountGroup: AccountGroupId]: AccountGroupMetadata;
+  };


From a sync with @danroc @gantunesr:

We could use this state instead:

Better locality with metadata

We would still persist everything (mainly because of the metadata)

We should probably rename this controller to AccountWalletController

We would have another MultichainAccountController (stateless) that would abstract high-level multichain accounts methods/capabilities on top of this controller for multichain accounts support

Suggested change

accountGroups: {

groups: {

// Wallet

[accountGroup: AccountGroupId]: {

// Multichain Account OR Account Group

[accountSubGroup: AccountGroupId]: AccountId[]; // Blockchain Accounts

};

};

};

accountGroupsMetadata: {

[accountGroup: AccountGroupId]: AccountGroupMetadata;

};

accountWallets: {

// Wallet

[accountWallet: AccountWalletId]: {

// Multichain Account OR Account Group

groups: [accountGroup: AccountGroupId]: {

accounts: AccountId[]; // Blockchain Accounts

metadata: Metadata;

},

metadata: Metadata;

};

};

@PatrykLucka WDYT?

can you share a quick draft of what would be the use cases the MultichainAccountController should be responsible for? I'm concerned about the over complexity that is being introduced around all the controllers that will manage accounts to their own extend and the still present accounts legacy code.

it does not need to be a new ADR, just a quick notion page will be enough to start setting the limits of each controller and how they interact between each other

Sorry for the delay.

My initial idea was to introduce a new MultichainAccountController mainly to expose "multichain account capabilities" like:

create/remove multichain account

get a blockchain account from a multichain account (given a specific scope for example)

get the associated wallet id or group id of a multichain account

The AccountTreeController would be responsible for the hierarchy and structure of accounts.
The MultichainAccountController would rely on the AccountTreeController for the structure (and could also provide the "rule" being used to group multichain accounts together) AND provide multichain capabilities.

I haven't discussed any of those designs with anyone TBH, was just something I had in mind when thinking about the new initiative.

packages/account-group-controller/src/AccountGroupController.ts

gantunesr · 2025-05-27T03:07:05Z

packages/account-group-controller/src/AccountGroupController.ts

+  accountGroups: {
+    groups: {
+      // Wallet
+      [accountGroup: AccountGroupId]: {
+        // Multichain Account OR Account Group
+        [accountSubGroup: AccountGroupId]: AccountId[]; // Blockchain Accounts
+      };
+    };
+  };
+  accountGroupsMetadata: {
+    [accountGroup: AccountGroupId]: AccountGroupMetadata;
+  };


can you share a quick draft of what would be the use cases the MultichainAccountController should be responsible for? I'm concerned about the over complexity that is being introduced around all the controllers that will manage accounts to their own extend and the still present accounts legacy code.

it does not need to be a new ADR, just a quick notion page will be enough to start setting the limits of each controller and how they interact between each other

packages/account-group-controller/src/AccountGroupController.ts

packages/account-wallet-controller/src/AccountWalletController.ts

…ount wallet naming

…eyring when entropy source is unknown

…controller) when naming keyring rule matches

ccharly · 2025-05-28T09:53:15Z

@metamaskbot publish-preview

github-actions · 2025-05-28T09:58:54Z

Preview builds have been published. See these instructions for more information about preview builds.

Expand for full list of packages and versions.

{
  "@metamask-previews/account-wallet-controller": "0.0.0-preview-9ae2ce46",
  "@metamask-previews/accounts-controller": "29.0.0-preview-9ae2ce46",
  "@metamask-previews/address-book-controller": "6.0.3-preview-9ae2ce46",
  "@metamask-previews/announcement-controller": "7.0.3-preview-9ae2ce46",
  "@metamask-previews/app-metadata-controller": "1.0.0-preview-9ae2ce46",
  "@metamask-previews/approval-controller": "7.1.3-preview-9ae2ce46",
  "@metamask-previews/assets-controllers": "65.0.0-preview-9ae2ce46",
  "@metamask-previews/base-controller": "8.0.1-preview-9ae2ce46",
  "@metamask-previews/bridge-controller": "28.0.0-preview-9ae2ce46",
  "@metamask-previews/bridge-status-controller": "25.0.0-preview-9ae2ce46",
  "@metamask-previews/build-utils": "3.0.3-preview-9ae2ce46",
  "@metamask-previews/chain-agnostic-permission": "0.7.0-preview-9ae2ce46",
  "@metamask-previews/composable-controller": "11.0.0-preview-9ae2ce46",
  "@metamask-previews/controller-utils": "11.9.0-preview-9ae2ce46",
  "@metamask-previews/delegation-controller": "0.3.0-preview-9ae2ce46",
  "@metamask-previews/earn-controller": "0.14.0-preview-9ae2ce46",
  "@metamask-previews/eip1193-permission-middleware": "0.1.0-preview-9ae2ce46",
  "@metamask-previews/ens-controller": "16.0.0-preview-9ae2ce46",
  "@metamask-previews/error-reporting-service": "0.0.0-preview-9ae2ce46",
  "@metamask-previews/eth-json-rpc-provider": "4.1.8-preview-9ae2ce46",
  "@metamask-previews/gas-fee-controller": "23.0.0-preview-9ae2ce46",
  "@metamask-previews/json-rpc-engine": "10.0.3-preview-9ae2ce46",
  "@metamask-previews/json-rpc-middleware-stream": "8.0.7-preview-9ae2ce46",
  "@metamask-previews/keyring-controller": "22.0.0-preview-9ae2ce46",
  "@metamask-previews/logging-controller": "6.0.4-preview-9ae2ce46",
  "@metamask-previews/message-manager": "12.0.1-preview-9ae2ce46",
  "@metamask-previews/multichain": "4.1.0-preview-9ae2ce46",
  "@metamask-previews/multichain-api-middleware": "0.4.0-preview-9ae2ce46",
  "@metamask-previews/multichain-network-controller": "0.7.0-preview-9ae2ce46",
  "@metamask-previews/multichain-transactions-controller": "1.0.0-preview-9ae2ce46",
  "@metamask-previews/name-controller": "8.0.3-preview-9ae2ce46",
  "@metamask-previews/network-controller": "23.5.0-preview-9ae2ce46",
  "@metamask-previews/notification-services-controller": "8.0.0-preview-9ae2ce46",
  "@metamask-previews/permission-controller": "11.0.6-preview-9ae2ce46",
  "@metamask-previews/permission-log-controller": "3.0.3-preview-9ae2ce46",
  "@metamask-previews/phishing-controller": "12.5.0-preview-9ae2ce46",
  "@metamask-previews/polling-controller": "13.0.0-preview-9ae2ce46",
  "@metamask-previews/preferences-controller": "18.0.0-preview-9ae2ce46",
  "@metamask-previews/profile-sync-controller": "15.0.0-preview-9ae2ce46",
  "@metamask-previews/queued-request-controller": "10.0.0-preview-9ae2ce46",
  "@metamask-previews/rate-limit-controller": "6.0.3-preview-9ae2ce46",
  "@metamask-previews/remote-feature-flag-controller": "1.6.0-preview-9ae2ce46",
  "@metamask-previews/sample-controllers": "0.1.0-preview-9ae2ce46",
  "@metamask-previews/selected-network-controller": "22.1.0-preview-9ae2ce46",
  "@metamask-previews/signature-controller": "29.0.0-preview-9ae2ce46",
  "@metamask-previews/token-search-discovery-controller": "3.2.0-preview-9ae2ce46",
  "@metamask-previews/transaction-controller": "56.2.0-preview-9ae2ce46",
  "@metamask-previews/user-operation-controller": "35.0.0-preview-9ae2ce46"
}

ccharly · 2025-05-28T10:27:48Z

@metamaskbot publish-preview

github-actions · 2025-05-28T10:33:15Z

Preview builds have been published. See these instructions for more information about preview builds.

Expand for full list of packages and versions.

{
  "@metamask-previews/account-wallet-controller": "0.0.0-preview-d75f4283",
  "@metamask-previews/accounts-controller": "29.0.0-preview-d75f4283",
  "@metamask-previews/address-book-controller": "6.0.3-preview-d75f4283",
  "@metamask-previews/announcement-controller": "7.0.3-preview-d75f4283",
  "@metamask-previews/app-metadata-controller": "1.0.0-preview-d75f4283",
  "@metamask-previews/approval-controller": "7.1.3-preview-d75f4283",
  "@metamask-previews/assets-controllers": "65.0.0-preview-d75f4283",
  "@metamask-previews/base-controller": "8.0.1-preview-d75f4283",
  "@metamask-previews/bridge-controller": "28.0.0-preview-d75f4283",
  "@metamask-previews/bridge-status-controller": "25.0.0-preview-d75f4283",
  "@metamask-previews/build-utils": "3.0.3-preview-d75f4283",
  "@metamask-previews/chain-agnostic-permission": "0.7.0-preview-d75f4283",
  "@metamask-previews/composable-controller": "11.0.0-preview-d75f4283",
  "@metamask-previews/controller-utils": "11.9.0-preview-d75f4283",
  "@metamask-previews/delegation-controller": "0.3.0-preview-d75f4283",
  "@metamask-previews/earn-controller": "0.14.0-preview-d75f4283",
  "@metamask-previews/eip1193-permission-middleware": "0.1.0-preview-d75f4283",
  "@metamask-previews/ens-controller": "16.0.0-preview-d75f4283",
  "@metamask-previews/error-reporting-service": "0.0.0-preview-d75f4283",
  "@metamask-previews/eth-json-rpc-provider": "4.1.8-preview-d75f4283",
  "@metamask-previews/gas-fee-controller": "23.0.0-preview-d75f4283",
  "@metamask-previews/json-rpc-engine": "10.0.3-preview-d75f4283",
  "@metamask-previews/json-rpc-middleware-stream": "8.0.7-preview-d75f4283",
  "@metamask-previews/keyring-controller": "22.0.0-preview-d75f4283",
  "@metamask-previews/logging-controller": "6.0.4-preview-d75f4283",
  "@metamask-previews/message-manager": "12.0.1-preview-d75f4283",
  "@metamask-previews/multichain": "4.1.0-preview-d75f4283",
  "@metamask-previews/multichain-api-middleware": "0.4.0-preview-d75f4283",
  "@metamask-previews/multichain-network-controller": "0.7.0-preview-d75f4283",
  "@metamask-previews/multichain-transactions-controller": "1.0.0-preview-d75f4283",
  "@metamask-previews/name-controller": "8.0.3-preview-d75f4283",
  "@metamask-previews/network-controller": "23.5.0-preview-d75f4283",
  "@metamask-previews/notification-services-controller": "8.0.0-preview-d75f4283",
  "@metamask-previews/permission-controller": "11.0.6-preview-d75f4283",
  "@metamask-previews/permission-log-controller": "3.0.3-preview-d75f4283",
  "@metamask-previews/phishing-controller": "12.5.0-preview-d75f4283",
  "@metamask-previews/polling-controller": "13.0.0-preview-d75f4283",
  "@metamask-previews/preferences-controller": "18.0.0-preview-d75f4283",
  "@metamask-previews/profile-sync-controller": "15.0.0-preview-d75f4283",
  "@metamask-previews/queued-request-controller": "10.0.0-preview-d75f4283",
  "@metamask-previews/rate-limit-controller": "6.0.3-preview-d75f4283",
  "@metamask-previews/remote-feature-flag-controller": "1.6.0-preview-d75f4283",
  "@metamask-previews/sample-controllers": "0.1.0-preview-d75f4283",
  "@metamask-previews/selected-network-controller": "22.1.0-preview-d75f4283",
  "@metamask-previews/signature-controller": "29.0.0-preview-d75f4283",
  "@metamask-previews/token-search-discovery-controller": "3.2.0-preview-d75f4283",
  "@metamask-previews/transaction-controller": "56.2.0-preview-d75f4283",
  "@metamask-previews/user-operation-controller": "35.0.0-preview-d75f4283"
}

ccharly · 2025-05-28T10:36:17Z

@metamaskbot publish-preview

github-actions · 2025-05-28T10:41:50Z

Preview builds have been published. See these instructions for more information about preview builds.

Expand for full list of packages and versions.

{
  "@metamask-previews/account-wallet-controller": "0.0.0-preview-59aaeb41",
  "@metamask-previews/accounts-controller": "29.0.0-preview-59aaeb41",
  "@metamask-previews/address-book-controller": "6.0.3-preview-59aaeb41",
  "@metamask-previews/announcement-controller": "7.0.3-preview-59aaeb41",
  "@metamask-previews/app-metadata-controller": "1.0.0-preview-59aaeb41",
  "@metamask-previews/approval-controller": "7.1.3-preview-59aaeb41",
  "@metamask-previews/assets-controllers": "65.0.0-preview-59aaeb41",
  "@metamask-previews/base-controller": "8.0.1-preview-59aaeb41",
  "@metamask-previews/bridge-controller": "28.0.0-preview-59aaeb41",
  "@metamask-previews/bridge-status-controller": "25.0.0-preview-59aaeb41",
  "@metamask-previews/build-utils": "3.0.3-preview-59aaeb41",
  "@metamask-previews/chain-agnostic-permission": "0.7.0-preview-59aaeb41",
  "@metamask-previews/composable-controller": "11.0.0-preview-59aaeb41",
  "@metamask-previews/controller-utils": "11.9.0-preview-59aaeb41",
  "@metamask-previews/delegation-controller": "0.3.0-preview-59aaeb41",
  "@metamask-previews/earn-controller": "0.14.0-preview-59aaeb41",
  "@metamask-previews/eip1193-permission-middleware": "0.1.0-preview-59aaeb41",
  "@metamask-previews/ens-controller": "16.0.0-preview-59aaeb41",
  "@metamask-previews/error-reporting-service": "0.0.0-preview-59aaeb41",
  "@metamask-previews/eth-json-rpc-provider": "4.1.8-preview-59aaeb41",
  "@metamask-previews/gas-fee-controller": "23.0.0-preview-59aaeb41",
  "@metamask-previews/json-rpc-engine": "10.0.3-preview-59aaeb41",
  "@metamask-previews/json-rpc-middleware-stream": "8.0.7-preview-59aaeb41",
  "@metamask-previews/keyring-controller": "22.0.0-preview-59aaeb41",
  "@metamask-previews/logging-controller": "6.0.4-preview-59aaeb41",
  "@metamask-previews/message-manager": "12.0.1-preview-59aaeb41",
  "@metamask-previews/multichain": "4.1.0-preview-59aaeb41",
  "@metamask-previews/multichain-api-middleware": "0.4.0-preview-59aaeb41",
  "@metamask-previews/multichain-network-controller": "0.7.0-preview-59aaeb41",
  "@metamask-previews/multichain-transactions-controller": "1.0.0-preview-59aaeb41",
  "@metamask-previews/name-controller": "8.0.3-preview-59aaeb41",
  "@metamask-previews/network-controller": "23.5.0-preview-59aaeb41",
  "@metamask-previews/notification-services-controller": "8.0.0-preview-59aaeb41",
  "@metamask-previews/permission-controller": "11.0.6-preview-59aaeb41",
  "@metamask-previews/permission-log-controller": "3.0.3-preview-59aaeb41",
  "@metamask-previews/phishing-controller": "12.5.0-preview-59aaeb41",
  "@metamask-previews/polling-controller": "13.0.0-preview-59aaeb41",
  "@metamask-previews/preferences-controller": "18.0.0-preview-59aaeb41",
  "@metamask-previews/profile-sync-controller": "15.0.0-preview-59aaeb41",
  "@metamask-previews/queued-request-controller": "10.0.0-preview-59aaeb41",
  "@metamask-previews/rate-limit-controller": "6.0.3-preview-59aaeb41",
  "@metamask-previews/remote-feature-flag-controller": "1.6.0-preview-59aaeb41",
  "@metamask-previews/sample-controllers": "0.1.0-preview-59aaeb41",
  "@metamask-previews/selected-network-controller": "22.1.0-preview-59aaeb41",
  "@metamask-previews/signature-controller": "29.0.0-preview-59aaeb41",
  "@metamask-previews/token-search-discovery-controller": "3.2.0-preview-59aaeb41",
  "@metamask-previews/transaction-controller": "56.2.0-preview-59aaeb41",
  "@metamask-previews/user-operation-controller": "35.0.0-preview-59aaeb41"
}

ccharly · 2025-05-28T15:47:02Z

@metamaskbot publish-preview

github-actions · 2025-05-28T15:52:30Z

Preview builds have been published. See these instructions for more information about preview builds.

Expand for full list of packages and versions.

{
  "@metamask-previews/account-tree-controller": "0.0.0-preview-d9a49231",
  "@metamask-previews/accounts-controller": "29.0.0-preview-d9a49231",
  "@metamask-previews/address-book-controller": "6.0.3-preview-d9a49231",
  "@metamask-previews/announcement-controller": "7.0.3-preview-d9a49231",
  "@metamask-previews/app-metadata-controller": "1.0.0-preview-d9a49231",
  "@metamask-previews/approval-controller": "7.1.3-preview-d9a49231",
  "@metamask-previews/assets-controllers": "65.0.0-preview-d9a49231",
  "@metamask-previews/base-controller": "8.0.1-preview-d9a49231",
  "@metamask-previews/bridge-controller": "28.0.0-preview-d9a49231",
  "@metamask-previews/bridge-status-controller": "25.0.0-preview-d9a49231",
  "@metamask-previews/build-utils": "3.0.3-preview-d9a49231",
  "@metamask-previews/chain-agnostic-permission": "0.7.0-preview-d9a49231",
  "@metamask-previews/composable-controller": "11.0.0-preview-d9a49231",
  "@metamask-previews/controller-utils": "11.9.0-preview-d9a49231",
  "@metamask-previews/delegation-controller": "0.3.0-preview-d9a49231",
  "@metamask-previews/earn-controller": "0.14.0-preview-d9a49231",
  "@metamask-previews/eip1193-permission-middleware": "0.1.0-preview-d9a49231",
  "@metamask-previews/ens-controller": "16.0.0-preview-d9a49231",
  "@metamask-previews/error-reporting-service": "0.0.0-preview-d9a49231",
  "@metamask-previews/eth-json-rpc-provider": "4.1.8-preview-d9a49231",
  "@metamask-previews/gas-fee-controller": "23.0.0-preview-d9a49231",
  "@metamask-previews/json-rpc-engine": "10.0.3-preview-d9a49231",
  "@metamask-previews/json-rpc-middleware-stream": "8.0.7-preview-d9a49231",
  "@metamask-previews/keyring-controller": "22.0.0-preview-d9a49231",
  "@metamask-previews/logging-controller": "6.0.4-preview-d9a49231",
  "@metamask-previews/message-manager": "12.0.1-preview-d9a49231",
  "@metamask-previews/multichain": "4.1.0-preview-d9a49231",
  "@metamask-previews/multichain-api-middleware": "0.4.0-preview-d9a49231",
  "@metamask-previews/multichain-network-controller": "0.7.0-preview-d9a49231",
  "@metamask-previews/multichain-transactions-controller": "1.0.0-preview-d9a49231",
  "@metamask-previews/name-controller": "8.0.3-preview-d9a49231",
  "@metamask-previews/network-controller": "23.5.0-preview-d9a49231",
  "@metamask-previews/notification-services-controller": "8.0.0-preview-d9a49231",
  "@metamask-previews/permission-controller": "11.0.6-preview-d9a49231",
  "@metamask-previews/permission-log-controller": "3.0.3-preview-d9a49231",
  "@metamask-previews/phishing-controller": "12.5.0-preview-d9a49231",
  "@metamask-previews/polling-controller": "13.0.0-preview-d9a49231",
  "@metamask-previews/preferences-controller": "18.0.0-preview-d9a49231",
  "@metamask-previews/profile-sync-controller": "15.0.0-preview-d9a49231",
  "@metamask-previews/queued-request-controller": "10.0.0-preview-d9a49231",
  "@metamask-previews/rate-limit-controller": "6.0.3-preview-d9a49231",
  "@metamask-previews/remote-feature-flag-controller": "1.6.0-preview-d9a49231",
  "@metamask-previews/sample-controllers": "0.1.0-preview-d9a49231",
  "@metamask-previews/selected-network-controller": "22.1.0-preview-d9a49231",
  "@metamask-previews/signature-controller": "29.0.0-preview-d9a49231",
  "@metamask-previews/token-search-discovery-controller": "3.2.0-preview-d9a49231",
  "@metamask-previews/transaction-controller": "56.2.0-preview-d9a49231",
  "@metamask-previews/user-operation-controller": "35.0.0-preview-d9a49231"
}

mcmire

Nice job! Just had some minor suggestions.

packages/account-tree-controller/src/index.ts

packages/account-tree-controller/src/AccountTreeController.test.ts

packages/account-tree-controller/src/index.ts

packages/account-tree-controller/src/AccountTreeController.ts

Co-authored-by: Elliot Winkler <[email protected]>

ccharly · 2025-06-04T14:18:46Z

@metamaskbot publish-preview

github-actions · 2025-06-04T14:24:29Z

Preview builds have been published. See these instructions for more information about preview builds.

Expand for full list of packages and versions.

{
  "@metamask-previews/account-tree-controller": "0.0.0-preview-8d14f81c",
  "@metamask-previews/accounts-controller": "30.0.0-preview-8d14f81c",
  "@metamask-previews/address-book-controller": "6.1.0-preview-8d14f81c",
  "@metamask-previews/announcement-controller": "7.0.3-preview-8d14f81c",
  "@metamask-previews/app-metadata-controller": "1.0.0-preview-8d14f81c",
  "@metamask-previews/approval-controller": "7.1.3-preview-8d14f81c",
  "@metamask-previews/assets-controllers": "68.0.0-preview-8d14f81c",
  "@metamask-previews/base-controller": "8.0.1-preview-8d14f81c",
  "@metamask-previews/bridge-controller": "32.1.0-preview-8d14f81c",
  "@metamask-previews/bridge-status-controller": "29.1.0-preview-8d14f81c",
  "@metamask-previews/build-utils": "3.0.3-preview-8d14f81c",
  "@metamask-previews/chain-agnostic-permission": "0.7.0-preview-8d14f81c",
  "@metamask-previews/composable-controller": "11.0.0-preview-8d14f81c",
  "@metamask-previews/controller-utils": "11.9.0-preview-8d14f81c",
  "@metamask-previews/delegation-controller": "0.4.0-preview-8d14f81c",
  "@metamask-previews/earn-controller": "1.0.0-preview-8d14f81c",
  "@metamask-previews/eip1193-permission-middleware": "0.1.0-preview-8d14f81c",
  "@metamask-previews/ens-controller": "16.0.0-preview-8d14f81c",
  "@metamask-previews/error-reporting-service": "1.0.0-preview-8d14f81c",
  "@metamask-previews/eth-json-rpc-provider": "4.1.8-preview-8d14f81c",
  "@metamask-previews/foundryup": "1.0.0-preview-8d14f81c",
  "@metamask-previews/gas-fee-controller": "23.0.0-preview-8d14f81c",
  "@metamask-previews/json-rpc-engine": "10.0.3-preview-8d14f81c",
  "@metamask-previews/json-rpc-middleware-stream": "8.0.7-preview-8d14f81c",
  "@metamask-previews/keyring-controller": "22.0.1-preview-8d14f81c",
  "@metamask-previews/logging-controller": "6.0.4-preview-8d14f81c",
  "@metamask-previews/message-manager": "12.0.1-preview-8d14f81c",
  "@metamask-previews/multichain": "4.1.0-preview-8d14f81c",
  "@metamask-previews/multichain-api-middleware": "0.4.0-preview-8d14f81c",
  "@metamask-previews/multichain-network-controller": "0.8.0-preview-8d14f81c",
  "@metamask-previews/multichain-transactions-controller": "2.0.0-preview-8d14f81c",
  "@metamask-previews/name-controller": "8.0.3-preview-8d14f81c",
  "@metamask-previews/network-controller": "23.5.1-preview-8d14f81c",
  "@metamask-previews/notification-services-controller": "10.0.0-preview-8d14f81c",
  "@metamask-previews/permission-controller": "11.0.6-preview-8d14f81c",
  "@metamask-previews/permission-log-controller": "3.0.3-preview-8d14f81c",
  "@metamask-previews/phishing-controller": "12.5.0-preview-8d14f81c",
  "@metamask-previews/polling-controller": "13.0.0-preview-8d14f81c",
  "@metamask-previews/preferences-controller": "18.1.0-preview-8d14f81c",
  "@metamask-previews/profile-sync-controller": "17.0.0-preview-8d14f81c",
  "@metamask-previews/queued-request-controller": "10.0.0-preview-8d14f81c",
  "@metamask-previews/rate-limit-controller": "6.0.3-preview-8d14f81c",
  "@metamask-previews/remote-feature-flag-controller": "1.6.0-preview-8d14f81c",
  "@metamask-previews/sample-controllers": "0.1.0-preview-8d14f81c",
  "@metamask-previews/seedless-onboarding-controller": "1.0.0-preview-8d14f81c",
  "@metamask-previews/selected-network-controller": "22.1.0-preview-8d14f81c",
  "@metamask-previews/signature-controller": "30.0.0-preview-8d14f81c",
  "@metamask-previews/token-search-discovery-controller": "3.2.0-preview-8d14f81c",
  "@metamask-previews/transaction-controller": "57.0.0-preview-8d14f81c",
  "@metamask-previews/user-operation-controller": "36.0.0-preview-8d14f81c"
}

feat(account-group-controller): add initial skeleton + logic for the …

66d6142

…AccountGroupController

ccharly assigned ccharly and PatrykLucka May 22, 2025

ccharly added the team-accounts label May 22, 2025

feat(account-group): add groupByWalletType rule and listAccountGroups…

e96d94e

… function

PatrykLucka force-pushed the feat/account-group-controller branch from 56bec57 to e96d94e Compare May 23, 2025 13:17

ccharly commented May 26, 2025

View reviewed changes

feat(account-group-controller): add default group name generation

36996c9

ccharly commented May 26, 2025

View reviewed changes

gantunesr reviewed May 27, 2025

View reviewed changes

refactor: change account-group name to account-wallet

63a0a51

PatrykLucka force-pushed the feat/account-group-controller branch from f740c42 to 63a0a51 Compare May 27, 2025 09:23

ccharly added 2 commits May 27, 2025 11:44

chore: rename account-group-controller -> account-wallet-controller

2fae020

chore: update README description

7eab09a

ccharly commented May 27, 2025

View reviewed changes

ccharly and others added 13 commits May 27, 2025 13:16

refactor: add new AccountGroupId

a378236

feat(account-wallet): use keyringsController hd keyring order for acc…

c84f1b4

…ount wallet naming

refactor(account-wallet): add #getEntropySourceName

6d0a0b2

refactor: rename rule methods

eecb5bd

refactor: get Snap name + name wallets when creating them

33fc136

chore: lint

7e29702

fix: fix build

22bf3dd

refactor: rename rule methods

f81b1c8

chore: add missing deps

3fdde1a

refactor: compute wallet name during rule matching + fallback to HD k…

e22063a

…eyring when entropy source is unknown

feat: add guard for non-grouped accounts

05f00cc

refactor: remove parseWalletId

d735a17

refactor: use similar pattern that keyringTypesToName (from accounts-…

693ee9c

…controller) when naming keyring rule matches

ccharly requested a review from a team as a code owner May 27, 2025 21:05

Merge branch 'main' into feat/account-group-controller

9ae2ce4

refactor: make init synchronous

d75f428

refactor: make controller's state argument Partial

59aaeb4

refactor: account-wallet-controller -> account-tree-controller

d9a4923

ccharly changed the title ~~feat: add AccountWalletController~~ feat: add AccountTreeController May 28, 2025

chore: lint

6ce45a8

mcmire reviewed Jun 3, 2025

View reviewed changes

ccharly and others added 12 commits June 4, 2025 09:56

refactor: also export getDefaultAccountTreeControllerState

a2b0144

Co-authored-by: Elliot Winkler <[email protected]>

refactor: rename state change event

23dfbdd

Co-authored-by: Elliot Winkler <[email protected]>

refactor: rename on event tests

e0cb2a5

Co-authored-by: Elliot Winkler <[email protected]>

refactor: remove unnecessary type cast

148105a

refactor: re-adapt test to use Partial

2ca1523

refactor: rename state fields

943f5bb

refactor: fix index exports

0d514b2

refactor: remove unused wallet category

5d038f0

refactor: cosmetic

e4a0a7d

Merge branch 'main' into feat/account-group-controller

7c5bf8f

build: re-align deps

e5b5d0c

fix: re-add missing keyring-api dep

8d14f81

Uh oh!

feat: add AccountTreeController #5847

Are you sure you want to change the base?

feat: add AccountTreeController #5847

Conversation

ccharly commented May 22, 2025

Explanation

References

Changelog

Checklist

Uh oh!

ccharly commented May 23, 2025

Uh oh!

github-actions bot commented May 23, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ccharly May 26, 2025

Choose a reason for hiding this comment

Uh oh!

gantunesr May 27, 2025

Choose a reason for hiding this comment

Uh oh!

ccharly Jun 4, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

gantunesr May 27, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ccharly commented May 28, 2025

Uh oh!

github-actions bot commented May 28, 2025

Uh oh!

ccharly commented May 28, 2025

Uh oh!

github-actions bot commented May 28, 2025

Uh oh!

ccharly commented May 28, 2025

Uh oh!

github-actions bot commented May 28, 2025

Uh oh!

ccharly commented May 28, 2025

Uh oh!

github-actions bot commented May 28, 2025

Uh oh!

mcmire left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ccharly commented Jun 4, 2025

Uh oh!

github-actions bot commented Jun 4, 2025

Uh oh!

Uh oh!

feat: add `AccountTreeController` #5847

feat: add `AccountTreeController` #5847